From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu, 31 Jul 2014 14:38:44 +0000 (+0200)
Subject: ScreenShield: remove obsolete comment and hack
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2291
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cd4eda8befcdff65c53202db181b26a1d252a807;p=gnome-shell.git

ScreenShield: remove obsolete comment and hack

We don't need to wait to until the stage window is mapped to take
the modal grab, because that code now runs in a startup-prepared
signal handler, which in turn runs some time after the mainloop
has started and well after the stage window is mapped.

https://bugzilla.gnome.org/show_bug.cgi?id=711682
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index fe00c2ddc..cbad7e945 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -902,17 +902,11 @@ const ScreenShield = new Lang.Class({
     },
 
     showDialog: function() {
-        // Ensure that the stage window is mapped, before taking a grab
-        // otherwise X errors out
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            if (!this._becomeModal()) {
-                // In the login screen, this is a hard error. Fail-whale
-                log('Could not acquire modal grab for the login screen. Aborting login process.');
-                Meta.quit(Meta.ExitCode.ERROR);
-            }
-
-            return false;
-        }));
+        if (!this._becomeModal()) {
+            // In the login screen, this is a hard error. Fail-whale
+            log('Could not acquire modal grab for the login screen. Aborting login process.');
+            Meta.quit(Meta.ExitCode.ERROR);
+        }
 
         this.actor.show();
         this._isGreeter = Main.sessionMode.isGreeter;